Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 13 Dec 2005 16:26:33 +0000 (16:26 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 13 Dec 2005 16:26:33 +0000 (16:26 +0000)

Trivial merge